typeck: merge opaque type inference logic #62090
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
varkor
reviewed
Jun 25, 2019
davidtwco
force-pushed
the
ice-async-await-out-of-range-substitution
branch
from
cdf4107
to
ffcb481
Compare
nikomatsakis
approved these changes
Jul 1, 2019
|
@bors r+ |
|
📌 Commit ffcb48103b36159fdd604827fabedd8a545a320b has been approved by |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #61775) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
This commit merges the logic used for opaque type type inference for impl Trait and non-impl Trait cases. This fixes an ICE where existential types used in the return types of functions would be allowed to have an out-of-scope generic type parameter.
davidtwco
force-pushed
the
ice-async-await-out-of-range-substitution
branch
from
ffcb481
to
de8660a
Compare
|
@bors r=nikomatsakis |
|
📌 Commit de8660a has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jul 8, 2019
…nge-substitution, r=nikomatsakis typeck: merge opaque type inference logic Fixes rust-lang#55872. See [relevant Zulip topic](https://rust-lang.zulipchat.com/#narrow/stream/187312-wg-async-foundations/topic/type.20parameter.20out.20of.20range.20.2355872). r? @nikomatsakis
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jul 8, 2019
…nge-substitution, r=nikomatsakis typeck: merge opaque type inference logic Fixes rust-lang#55872. See [relevant Zulip topic](https://rust-lang.zulipchat.com/#narrow/stream/187312-wg-async-foundations/topic/type.20parameter.20out.20of.20range.20.2355872). r? @nikomatsakis
bors
added a commit
that referenced
this pull request
Jul 9, 2019
Rollup of 4 pull requests Successful merges: - #61613 (Support `impl Trait` in inlined documentation) - #62090 (typeck: merge opaque type inference logic) - #62403 (Replace SliceConcatExt trait with inherent methods and SliceConcat helper trait) - #62494 (Remove unused dependencies) Failed merges: r? @ghost
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jul 9, 2019
…nge-substitution, r=nikomatsakis typeck: merge opaque type inference logic Fixes rust-lang#55872. See [relevant Zulip topic](https://rust-lang.zulipchat.com/#narrow/stream/187312-wg-async-foundations/topic/type.20parameter.20out.20of.20range.20.2355872). r? @nikomatsakis
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jul 9, 2019
…nge-substitution, r=nikomatsakis typeck: merge opaque type inference logic Fixes rust-lang#55872. See [relevant Zulip topic](https://rust-lang.zulipchat.com/#narrow/stream/187312-wg-async-foundations/topic/type.20parameter.20out.20of.20range.20.2355872). r? @nikomatsakis
bors
added a commit
that referenced
this pull request
Jul 9, 2019
Rollup of 4 pull requests Successful merges: - #60458 (Add key and value methods to DebugMap) - #62090 (typeck: merge opaque type inference logic) - #62403 (Replace SliceConcatExt trait with inherent methods and SliceConcat helper trait) - #62494 (Remove unused dependencies) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #55872. See relevant Zulip topic.
r? @nikomatsakis